From b0016252cfe33c11172443b1ed0871d4fb811607 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Sat, 4 May 2013 12:05:46 +0400 Subject: [PATCH] Pass screen to visual init (no default screen is available yet) https://bugzilla.gnome.org/show_bug.cgi?id=700444 --- gdk/win32/gdkdisplay-win32.c | 2 +- gdk/win32/gdkprivate-win32.h | 2 +- gdk/win32/gdkvisual-win32.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index 6d17ace8c3..8e3ae359aa 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -206,7 +206,7 @@ _gdk_win32_display_open (const gchar *display_name) _gdk_screen = g_object_new (GDK_TYPE_WIN32_SCREEN, NULL); _gdk_monitor_init (); - _gdk_visual_init (); + _gdk_visual_init (_gdk_screen); _gdk_windowing_window_init (_gdk_screen); _gdk_events_init (); _gdk_input_init (_gdk_display); diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index 9c860df1d7..3c2fed9149 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -502,7 +502,7 @@ void _gdk_win32_windowing_init (void); void _gdk_windowing_window_init (GdkScreen *screen); void _gdk_root_window_size_init (void); void _gdk_monitor_init(void); -void _gdk_visual_init (void); +void _gdk_visual_init (GdkScreen *screen); void _gdk_dnd_init (void); void _gdk_events_init (void); void _gdk_input_init (GdkDisplay *display); diff --git a/gdk/win32/gdkvisual-win32.c b/gdk/win32/gdkvisual-win32.c index 730ff1e4d8..34ee4340ed 100644 --- a/gdk/win32/gdkvisual-win32.c +++ b/gdk/win32/gdkvisual-win32.c @@ -42,7 +42,7 @@ static gint available_depths[1]; static GdkVisualType available_types[1]; void -_gdk_visual_init (void) +_gdk_visual_init (GdkScreen *screen) { struct { @@ -61,7 +61,7 @@ _gdk_visual_init (void) gint map_entries = 0; system_visual = g_object_new (GDK_TYPE_VISUAL, NULL); - system_visual->screen = gdk_screen_get_default(); + system_visual->screen = screen; if (rastercaps & RC_PALETTE) { -- 2.30.2